Gem mysql2 + port for test environment

ms32035 лет %!s(int64=10): %!d(string=назад)
Родитель
Сommit
e5c2cac42a
3 измененных файлов с 3 добавлено и 3 удалено
  1. 1 2
      app/models/agent.rb
  2. 1 0
      config/database.yml
  3. 1 1
      lib/rdbms_functions.rb

+ 1 - 2
app/models/agent.rb

@@ -128,8 +128,7 @@ class Agent < ActiveRecord::Base
128 128
     if keep_events_for == 0
129 129
       events.update_all :expires_at => nil
130 130
     else
131
-      #events.update_all "expires_at = DATE_ADD(`created_at`, INTERVAL #{keep_events_for.to_i} DAY)"
132
-      events.update_all "expires_at = " + rdbms_date_add("created_at","DAY",keep_events_for.to_i) 
131
+      events.update_all "expires_at = " + rdbms_date_add("created_at", "DAY", keep_events_for.to_i) 
133 132
     end
134 133
   end
135 134
 

+ 1 - 0
config/database.yml

@@ -21,6 +21,7 @@ test:
21 21
   socket: <%= ENV['DATABASE_SOCKET'] || ["/var/run/mysqld/mysqld.sock", "/opt/local/var/run/mysql5/mysqld.sock", "/tmp/mysql.sock"].find{ |path| File.exist? path } %>
22 22
   encoding: <%= ENV['DATABASE_ENCODING'] || "utf8" %>
23 23
   reconnect: <%= ENV['DATABASE_RECONNECT'] || "true" %>
24
+  port: <%= ENV['DATABASE_PORT'] || "" %>
24 25
   pool: <%= ENV['DATABASE_POOL'] || "5" %>
25 26
 
26 27
 production:

+ 1 - 1
lib/rdbms_functions.rb

@@ -2,7 +2,7 @@ module RDBMSFunctions
2 2
   def rdbms_date_add(source, unit, amount)
3 3
     adapter_type = connection.adapter_name.downcase.to_sym
4 4
     case adapter_type
5
-      when :mysql
5
+      when :mysql, :mysql2
6 6
         "DATE_ADD(`#{source}`, INTERVAL #{amount} #{unit})"
7 7
       when :postgresql    
8 8
         "(#{source} + INTERVAL '#{amount} #{unit}')"